a7ed0a04b6abf82eee23b19335363ba91eecd546,opennms-services/src/main/java/org/opennms/netmgt/threshd/SnmpThresholder.java,SnmpThresholder,getDataSourceLabel,#File#SnmpThresholdNetworkInterface#ThresholdEntity#,599

Before Change


        String dsLabelValue = null;
        
        try {
            dsLabelValue = ResourceTypeUtils.getStringProperty(directory, threshold.getDatasourceLabel());
        } catch (DataAccessException e) {
            if (log().isDebugEnabled()) {
                log().debug ("getDataSourceLabel: I/O exception when looking for strings.properties file for node id: " + snmpIface.getNodeId() + " looking here: " + directory + ": " + e, e);

After Change


        String dsLabelValue = null;
        
        try {
            String key = threshold.getDatasourceLabel();
            dsLabelValue = (key == null ? null : ResourceTypeUtils.getStringProperty(directory, key));
        } catch (DataAccessException e) {
            if (log().isDebugEnabled()) {
                log().debug ("getDataSourceLabel: I/O exception when looking for strings.properties file for node id: " + snmpIface.getNodeId() + " looking here: " + directory + ": " + e, e);